remove unnecessary casting away of const.

diff --git a/cet.cc b/cet.cc
index ecb036d1313ebc992742db5349e9b2cf08cebc2e..4e44ffcb824d089d4957048251d4d16fed462b4e 100644 (file)
--- a/cet.cc
+++ b/cet.cc
@@ -163,7 +163,7 @@ cet_utf8_to_ucs4(const char* str, int* bytes, int* value)
           if ((*cp & 0xc0) != 0x80) {
             break;  /* invalid         */
           } else if (i == 0) {         /* all valid    */
-            char* c = const_cast<char*>(str);          /* found valid sequence, now storing value */
+            const char* c = str;               /* found valid sequence, now storing value */
             int res = *c++ & (mask ^ 0xFF);
             i = len;
             while (i-- > 0) {
@@ -203,9 +203,9 @@ cet_utf8_to_ucs4(const char* str, int* bytes, int* value)
 short
 cet_ucs4_to_char(const int value, const cet_cs_vec_t* vec)
 {
-  cet_ucs4_link_t* link;
+  const cet_ucs4_link_t* link;
 
-  if ((link = const_cast<cet_ucs4_link_t*>(vec->ucs4_link))) {
+  if ((link = vec->ucs4_link)) {
     int i = 0;
     int j = vec->ucs4_links - 1;                       /* validate ucs value against vec */
     while (i <= j) {
@@ -222,7 +222,7 @@ cet_ucs4_to_char(const int value, const cet_cs_vec_t* vec)
     }
   }
 
-  if ((link = const_cast<cet_ucs4_link_t*>(vec->ucs4_extra))) {        /* can be NULL */
+  if ((link = vec->ucs4_extra)) {      /* can be NULL */
     int i = 0;
     int j = vec->ucs4_extras - 1;
     while (i <= j) {
@@ -362,9 +362,10 @@ cet_utf8_strndup(const char* str, const int maxlen)
 char*
 cet_str_utf8_to_any(const char* src, const cet_cs_vec_t* vec)
 {
-  char* c = const_cast<char*>(src);
+  const char* c = src;
   int len;
-  char* res, *dest, *cend;
+  char* res, *dest;
+  const char* cend;
 
   if (c == nullptr) {
     return nullptr;
@@ -397,10 +398,11 @@ char*
 cet_str_any_to_utf8(const char* src, const cet_cs_vec_t* vec)
 {
   int len, value;
-  char* result, *cin, *cout;
+  char* result, *cout;
+  const char* cin;
   char temp = CET_NOT_CONVERTABLE_DEFAULT;
 
-  cin = const_cast<char*>(src);
+  cin = src;
   if (cin == nullptr) {
     return nullptr;
   }
@@ -417,7 +419,7 @@ cet_str_any_to_utf8(const char* src, const cet_cs_vec_t* vec)
   }
 
   result = cout = (char*) xmalloc(len + 1);
-  cin = const_cast<char*>(src);
+  cin = src;
 
   while (*cin != '\0') {
     if (CET_ERROR == cet_char_to_ucs4(*cin++, vec, &value)) {